issue #504

these are my changes discussed in 

https://github.com/fernandezpablo85/scribe-java/issues/504