Fix visibility on a private variable
Improve loading of config
Merge remote-tracking branch 'origin/dev'
Update version number