Off by one error, sorry. :(
Merge remote-tracking branch 'upstream/master'
Merge pull request #490 from lcd047/master

Off by one error