Getting ready for beta0.7