Fixed indice bugs caused by the api change
Merge pull request #5 from Widdershin/master

Rebasing develop for merge
Merge pull request #6 from Widdershin/develop

Develop is stable, pulling to master