Added offset to options
Merge branch 'offset-option'