Updated code to reflect changes in the framework
Updated readme
Merge branch 'develop' into integration/propel