more changes
Merge pull request #79 from Ricky1833/master

more changes
Merge pull request #26 from IanJRigg/master

<start updating/>