Merge pull request #740 from mkresin/master