Merge branch 'dev'
fix composer syntax
fix composer syntax