Update README
Merge branch 'feature/modular' into develop
Merge branch 'develop'