some touches suggested by @cordoval. fixes #66
Merge pull request #67 from pmjones/develop-2

some touches suggested by @cordoval. fixes #66