Merge pull request #89 from it-workshop/wp/CAROLINE-9/1

Wp/caroline 9/1
(cherry picked from commit afb361356fe4c405ff734ef09b5d4bf945a2d2ff)
Merge pull request #100 from it-workshop/wp-1.0.0/CAROLINE-9/1

Merge pull request #89 from it-workshop/wp/CAROLINE-9/1