merging in major work from visitor branch #26

Closed patrickhuber closed 9 years ago