Fix some syntax errors
Merge branch 'master' into tourapp
Fix some syntax errors