Fixed " index out of range" error
Merge pull request #42 from bstascavage/master

Fixed " index out of range" error