Added checking for print on and echo on
Merge branch 'release/v1.0.1'