Syntax
Merge pull request #1 from fh/t/syntax

Syntax fixes