Merge pull request #5 from Magenic/master

get Justin's changes
Merge pull request #27 from Bowman74/master

Merge pull request #5 from Magenic/master