Fixes #39.
Merge pull request #40 from AshFurrow/incorrect-offset

Fixes #39.