Merge branch 'develop'
fix composer to packagist compatibility