Updated to v0.4 Alpha