Merge branch 'master' into Refactor
Store parameters as a QMap
Merge branch 'Refactor'