Merge pull request #31 from tschmorleiz/master

First steps towards guided tours