Merge pull request #110 from it-workshop/wp/CAROLINE-39/1

CAROLINE-39: Fix configuration.(cherry picked from commit e81247c3d2dba41c0a6a3fa2b8aec44969dbfc4f)
Merge pull request #111 from it-workshop/wp-1.0.0/CAROLINE-39/1

Merge pull request #110 from it-workshop/wp/CAROLINE-39/1