Syntax fix
Merge pull request #47 from fdammeke/master

Silly errors due to merge conflicts.