Merge branch 'f/parameters' into dev
Merge branch 'dev' of https://github.com/waaghals/Tainted-Aberrant-Lion into dev
Created test document for #36