Fixed error in parameter loop for plotting
Merge branch 'devel'