Fixed offset parsing bug
Merge branch 'dev'