Fold in changes
Bump versions to 0.2.2