Merge 1.0.0 into master