- configuration fix
Merge origin/master