Merged changes for v 0.2.2 (not sure why I needed to merge as I had no changes, very weird).