Update readme
Merge pull request #191 from gowaddle/dev

Dev
Merge pull request #207 from gowaddle/dev

Merge dev into master
Merge pull request #208 from gowaddle/master

Merge master into dev