Merges branch 'release/0.1.20' into develop
Adds global flag for nocp mode
Bumps version to 0.1.21
Merges branch 'release/0.1.21'