Merge pull request #1 from Netzkinder/feature/visiting

Feature/visiting