Updated to 0.7 branch