Solves CRAFTERCMS-478
Merge pull request #79 from cortiz/master

Solves CRAFTERCMS-478
Fix for CRAFTERCMS-506.