Merge pull request #9 from dhaskew/master

Added bug fixes for index and show
Merge pull request #1 from rvirani1/master

Merge pull request #9 from dhaskew/master