Updated to Alpha 0.6