Removed a workaround
Release 0.2.0
Prepare for next development iteration