Merge pull request #8 from jamiedigweed/master

master merge
fix for msay maybe?
Merge pull request #154 from yashaldie/master

fix for msay maybe?
Merge pull request #155 from jamiedigweed/master

Update to current