Make doctor script invocation cleaner and more flexible
Release 1.1.1