Work on version 1.0.0