Updated to reflect new features and refactoring.
Merge branch 'develop'