Merge pull request #54 from gsr-shanks/master

Merge pull request #53 from gsr-shanks/dev
Merge pull request #55 from gsr-shanks/dev

Merge pull request #54 from gsr-shanks/master