Backport of JBWEB-281
Merge pull request #14 from barreiro/master

Backport of JBWEB-281