Minor tweaks
Merge pull request #634 from erasaur/master

Minor tweaks