Merge branch 'UI++'
Updated Readme
Oops, wrong order
Merge branch 'master' into UI++