Merge pull request #593 from sodor/master