Reformat code
Merge pull request #25 from mkalb/develop

Reformat code