v0.2.0

Merging to v0.2