Syntax fixes
Merge pull request #15 from GrahamCampbell/master

Syntax fixes