C09 completely redone (and C07 - small fixes)
Merge branch 'atc' of https://github.com/Pharmacon/knowledgeBase into atc