#34 code style change
Merge branch 'issue_34'