Merge pull request #108 from it-workshop/wp/CAROLINE-3/1

Wp/caroline 3/1
(cherry picked from commit 6621175317ec98236ddc2902431baecce8a71e21)
Merge pull request #116 from it-workshop/wp-1.0.0/CAROLINE-3/1

Merge pull request #108 from it-workshop/wp/CAROLINE-3/1