Fix syntax error
Merge branch 'issue/83' into dev