fixes merge conflicts between iros' PRs, and bumps version to 0.2.0