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

Wp/caroline 1/1
(cherry picked from commit 0b7025e3c9d0ebd824a6efa3f7b94e05c7a6d491)
Merge pull request #106 from it-workshop/wp-1.0.0/CAROLINE-1/1

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