1338-offbyone
Merge pull request #60 from psm1k3/master

1338-offbyone