Minor tweaks
Merge pull request #1 from loki2302/master

Minor tweaks