0.2.0

Merge changes from 2.0 branch