Fix bugs in list index
Merge pull request #20 from theponti/develop

Fix bugs in list index