Updated to 0.0.2-beta