Syntax fixes
Merge pull request #25 from GrahamCampbell/master

Syntax fixes