added uml diagram and updated readme
Merge branch 'develop'