Merge changes for release 0.2.0