Develop 0.4.0