Final commit for v0.1.44