update composers, hopefully trigger travis and scrutinizer
update keywords
Merge branch 'develop-2'