Merge pull request #11 from dgsb/master

A set of small fixes