Update master to version 2.0.1