Merge pull request #31 from janderse/master

Minor tweaks