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

Closes GH-48
in 0 seconds and was queued for 0 seconds