Merge pull request #52 from gsr-shanks/master

Rebase with master
Merge pull request #53 from gsr-shanks/dev

Merge pull request #52 from gsr-shanks/master