Added offset handling
Merge branch 'master' of github.com:ramatevish/hackjam2013