Merge pull request #463 from pixelroot/master