Merge pull request #17 from pthariensflame/master

Formatting