init.
Merge conflicts.
Prepare for 1.0.0.