Updated to 0.2