Minor corrections & tweaks
Merge pull request #1 from renehamburger/patch-1

Minor corrections & tweaks