added changes recommended by wisesense
fixed minor bug in cli saving
removed 'test scpi.txt'
Merge branch 'wisesense_changes' into development
Merge branch 'development'