Updated to 0.0.7 Alpha