Merge pull request #6 from PurpleKangaroo/master

merge
Merge pull request #50 from HoltMaki/master

Merge pull request #6 from PurpleKangaroo/master