Merge pull request #16 from melezov/master

Format & Cleanup fixes
Merge remote-tracking branch 'upstream/master'