Minor tweaks
Merge pull request #109 from Yomomsofat/master

Minor tweaks