feature2
syntax error fixed
updated some error
Merge branch 'feature2' into develop