Refactor
README.md updated
Merge branch 'develop'