fix medicine method to include cost
Merge origin/master