Merge branch 'performance-profiling-qbx-fmm' into 'master'

Make performance model work again and make it possible for the user to tweak the stick out

Closes #48

See merge request !33