Fixed some mistakes in C10
Merge branch 'atc' of git://github.com/pharmacon/knowledgeBase into atc