fixed syntax error
Merge branch 'dev' into production