Merge pull request #3 from rogr/spelunker

Spelunker