Small commit for 0.3.6