Merge pull request #7 from leadhead9/develop

Formatting and cleanup
Merge remote-tracking branch 'origin/master' into develop