Bumping verison to 0.2.0 and resolving build conflicts.