Merge pull request #306 from Preffer/master