v0.4, comments added