added proper doctor implementation
added proper doctor implementation
Merge remote-tracking branch 'origin/master'
doctor coming to the stage