Merge pull request #1242 from oneru/master