2.0.0 release update

2.0.0 merge and release