Merge to release 0.2.0