Feature/master/visitable objects

This is based on GH-221.