merge 1.0 to master

Update master with 1.0 branch.