Merge pull request #5 from vincentmrose/master

Format fixes
Merge pull request #2 from OberstK/master

Merge pull request #5 from vincentmrose/master