Add topic (index) parsing back in, and update the tests
Merge pull request #14 from notthatbreezy/master

Add topic (index) parsing back in, and update the tests