Minor tweaks
Merge pull request #8 from eile/master

Minor tweaks