Fix for CRAFTERCMS-521.
Merge pull request #96 from avasquez614/master

Fix for CRAFTERCMS-521