Fixed the #24 issue
Merge branch '4.1.0' of https://github.com/Kooboo/CMS into 4.1.0