index method branch
remove old methods
database option added, but not yet implemented
Merge pull request #6 from dwillis/index-method

Merge index method