Just some things.
Merge pull request #22 from dennmat/patch-10

Just some things.