Getting code ready for 1.0.0