Cleaning up and merging the 1.0 branch.