Minor tweaks
Merge pull request #8 from jyek/master

Minor tweaks