TODO: removed a task
v0.3.6 released
Merge branch 'release/0.3.6' into develop
Next version is 0.3.7