Updated composer keywords
Merge branch 'refs/heads/master' into development
Merge branch 'refs/heads/development'