Merge pull request #236 from dejan-brkic/master

CRAFTERCMS-821
 Solves CRAFTERCMS-804
Merge pull request #237 from cortiz/master

 Solves CRAFTERCMS-804