Final commit for v0.3