Merge pull request #1 from sugarcubes/master