Fixes #1160
Small fixe for #1159
Remove once executed
Fixes 1109, use it with Jersey
New annotation
Add a comment for #1035