Keys of generated hash are now configurable
No conflicts possible with config parameters
Merge branch 'develop-adding-variable-keys' into develop