Set development version to 0.3-SNAPSHOT
Fix concurrency bugs

- fixes #3
Merge branch 'master' into r-0.2
Set release version to 0.2.1