Merge branch 'release/v0.2.1'
Merge tag 'v0.2.1' into develop

Changed class names to avoid collisions