Updated to 0.4 beta