updated visitor class and class path
Merge branch 'dev'