medicine partly progressed
Merge origin/master