Updated to 0.4