Some more
Merge branch 'master' of https://github.com/j-dasilva/cms