added investigator function
Merge origin/master