Clean-up & add read me content
Merge branch 'develop'