Merge pull request #52 from gsr-shanks/master

Rebase with master