Merge pull request #10 from IanJRigg/master

Grabbing Latest
Merge pull request #44 from Ricky1833/master

Merge pull request #10 from IanJRigg/master