Merge pull request #1 from ecomfe/develop

merge develop
Merge branch 'develop'
update README
Merge branch 'master' into develop