Main changes

Version 2.0.0