Merge pull request #29 from CrawKatt/salamandra_index