Go back to integer indexes
Merge pull request #8 from pedrocunha/tweaked-for-speed

Tweaked for speed