Merge pull request #28 from CrawKatt/salamandra_index