Updates for 0.9
Updates for 0.9