Corrected wording error
Corrected bug in setting plotting parameters
Merge branch 'devel'