updated the code to 2.0.0 release

This updates the code from the 2.0.0 beta to the 2.0.0 final version.