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

 Solves CRAFTERCMS-804