Merged release-1.0.0 to master