Merge pull request #1 from infinitetoken/master

Cleanup
Add table to index
Update
Merge