Merge pull request #42 from HoltMaki/master

pull tags
Merge pull request #5 from PurpleKangaroo/master

Merge pull request #42 from HoltMaki/master