Merge v1.0 branch into master