Fixes issue #201
Fixes #201. small refactoring
Fixes #201. small refactoring
Fixes #201. small refactoring
Fixes #201. small refactoring
Fixes #201. small refactoring
Merge pull request #203 from msevestre/ckeditor_bug

Fixes issue #201