Upgrades to >0.3.6