v 0.2.0
resolving the merge conflicts