Fixed outofbounds exception
Merge pull request #96 from jimmy04500/master

Fixed outofbounds exception