Final commit for 0.2