Commit
Merge pull request #26 from nathantoews/master

Commit