Merge pull request #26 from carlieh/master

Final pull y'all