Fix for CRAFTERCMS-522.
Merge pull request #100 from avasquez614/master

Fix for CRAFTERCMS-522