Update version to 0.2.0-SNAPHOT.
Some work.
Simplify code.
Merge branch 'fix' into develop.
Update version to 0.2.0.