more cleaning, added index
Merge pull request #1 from http404error/master

more cleaning, added index