Coding conventions fixes
Merge pull request #48 from hannu/syntax-fixes

Coding conventions fixes