Minor tweaks
Merge pull request #159 from Zearin/patch-1

Minor tweaks