Merge tag 'v0.2.1' into develop

Changed class names to avoid collisions
wpm settings better persistency
upped version number
Merge branch 'release/v0.2.2'