Final commit of 0.0.9