Reformat project
Merge pull request #164 from akkie/master

Reformat project