fixed offset setting calculation when it was null
Merge branch 'master' of https://github.com/yairEO/endless
-