Final (?) commit
Merge pull request #11 from BrennanJones/master

Final (?) commit