updated version to 0.21
Merge remote-tracking branch 'origin/0.5' into 0.5
moved version to 0.22