Zerotwo

Update master to version 0.2.0