Bug fix: cal fit amplitude and phase parameters were not set
Merge branch 'master' into devel