Final commit for 0.8.4