Merge pull request #1 from pocketmoon/master

To shawn from pocket moon (trying again to merge your changes using github interface)