Merge branch 'release/0.2.1'
Correctly return success flag
Merge branch 'zintus-master' into develop