Merge pull request #7 from PurpleKangaroo/master

merge
Merge pull request #51 from HoltMaki/master

Merge pull request #7 from PurpleKangaroo/master