Merge pull request #79 from cortiz/master

Solves CRAFTERCMS-478
Solves CRAFTERCMS-477