FIX Index out of range.
Merge pull request #10 from bmiro/fix_index_out_of_range

FIX Index out of range.