Merge pull request #631 from kimgr/master