Merge pull request #9 from dhaskew/master

Added bug fixes for index and show