Typo fix
Formatting
Merge pull request #28 from marcandre/tweaks

Tweaks