Merge pull request #26 from IanJRigg/master

getting latest
Should be final changes
last change
last change
Merge pull request #106 from Ricky1833/master

Final version