Update README.md
Merge branch 'develop'
Resolving conflicts
Resolved conflict in README.md
Renaming packages