Merge pull request #1 from knockrentals/master

Merging from knockrentals:master
Fix indexing error
Merge pull request #9 from ignaciovazquez/fix-indexing-error

Fix indexing error