Merge pull request #22 from jakehare/master

jake test