Final commit for v0.4