Update for 0.3.10 development