Minor tweaks
Merge pull request #1 from teon/master

Minor tweaks