Updated to 0.3