Closing branch, development for 2.0 complete