Merge pull request #54 from justinmclean/master

Actually this is the correct place