Updated to 0.2.2