Merge pull request #109 from crotger/master

Munge and Indexing fixes