coding standards
Merge pull request #108 from dereuromark/develop

coding standards