Updated to version 0.4 Alpha