c07 fixed + and *
Merge branch 'atc' of https://github.com/Pharmacon/knowledgeBase into atc