Cleanup and added Readme.
Merge branch 'master' into develop