Merge pull request #56 from gsr-shanks/master

Merge pull request #55 from gsr-shanks/dev