Corrections for CarteBlanche 0.1
Merge branch 'wip'