Merge branch 'index-out-of-bounds-fix'

Closes GH-48
in 0 seconds and was queued for 105 minutes and 36 seconds
latest