Fix syntax
Merge branch 'issues/21' into dev