1.0

Merge 1.0 branch to master for release