Bug fix with breaking changes, bump version to 0.2.0