doctor functionalities
Merge origin/master