Merge branch 'develop'
Updated package name
Merge branch 'master' into develop