Made some small tweaks.
Merge pull request #7 from ajorians/SmallTweaks

Made some small tweaks.