Syntax fixes
Merge pull request #33 from varya/features/syntax-fixes

Syntax fixes