Merge pull request #2 from christianwach/master

A couple of enhancements