Merge branch 'hotfix/0.0.7' into develop
add extra plugin
Merge branch 'develop'