Updated to 0.6beta1