Updated README to reflect recent refactoring.
Merge branch 'develop'