Merge pull request #5 from petemmitchell/master

Updating
Merge pull request #7 from petemmitchell/dev

Merge pull request #5 from petemmitchell/master
Merge pull request #8 from petemmitchell/master

Adding previous merges from dev