REFACTORING: supporting flag about receiving an offset or not.
Merge pull request #722 from josedonizetti/supporting_offset

REFACTORING: supporting flag about receiving an offset or not.