Added indices
Merge pull request #185 from WouterJ/add_indexes

Added indices