asd
Merge branch 'gad' of https://github.com/MSeGS/cms into gad
small fixes