bug fixed for visitor
Merge remote-tracking branch 'upstream/master'
Merge pull request #545 from wenshao/master

bug fixed