Merge pull request #634 from mjanda/master