Merge pull request #15 from tas50/master

Pile of minor fixes