code style improvements
Merge branch 'master' into codeDocumentation
Merge pull request #63 from ray176/codeDocumentation

code style improvements