fix #25
Merge pull request #27 from szelga/fix_cms

fix #25