Updated to 0.8 beta