First commit for 0.9.4