Updated to 0.2.0 for this branch