Solves CRAFTERCMS-809
Merge pull request #230 from cortiz/master

Solves CRAFTERCMS-809