Final commit for v0.01