added preservation of --no-write arg
Merge branch 'no_write0.0.6' into develop0.0.6