Configuring CK
Merge branch 'master' into Markdown