Merge pull request #42 from ovidiuiliescu/master-enough

Fixed off by one error that could cause array index out of bounds except...
Merge remote-tracking branch 'enough-origin/master' into master-enough