Release 2.0

Release 2.0 changes