Add indexes

Closes #3
Merge pull request #22 from jonmagic/add-indexes

Add indexes