Merge pull request #25 from FLHerne/master

Misc tweaks