Adds nocp with -k switch.
Bumps version to 0.1.20
Merges branch 'release/0.1.20' into develop