Minor syntax changes
Merge pull request #27 from matseng/featureBranch4

Minor syntax changes