Update master branch for 1.0 release