Final commit for v0.2