commit
Merge pull request #101 from HoltMaki/master

merge