Merge pull request #352 from oliverds/master

A couple of enhancements