Updated to V0.5