added support for
Merge branch 'master' of github.com:EmergeAdapt/expressive