fixed JENKINS-21527 issue

https://issues.jenkins-ci.org/browse/JENKINS-21527
Coorection ticket GitHub
résolution https://issues.jenkins-ci.org/browse/JENKINS-20256
Merge pull request #24 from shinstudio/master

fixed JENKINS-21527 issue
Merge pull request #27 from yohanbernard/master

résolution https://issues.jenkins-ci.org/browse/JENKINS-20256
Resolving conflicts with the upstream