Fix syntax-errors
Merge branch 'hotfix/0.1-syntax-fix'