Improvement on the configuration and others.
Merge branch 'tmpwork'