Add Syntax check
Merge branch 'syntax-check'