Merge pull request #16 from david-farrar/master

Bugfixes