Finished v0.4.0