updated with the latest version of the 1.0.0 branch