Merge pull request #2 from aFreshMelon/master

Minor tweaks