Merge pull request #48 from martindiphoorn/master

Just some minor syntax changes