Merge pull request #9 from JAT-English/dev

Dev
Merge pull request #10 from JAT-English/dev

Dev
Merge pull request #11 from JAT-English/dev

Dev
Merge pull request #12 from JAT-English/master

new stuff