Merge pull request #10 from nickoram/master

FORMATTING
WIP DO NOT MERGE