Merge pull request #110 from wolfgangmm/develop

[severe] Crash recovery fix
A parameter is a parameter through and through
Merge pull request #111 from adamretter/develop

A parameter is a parameter through and through
Adding comments to understand the class. Required to do some refactoring later.
Merge pull request #112 from dizzzz/develop

Adding comments to understand the class. Required to do some refactoring...
Merge branch 'develop' into feature/recovery