Fix for CRAFTERCMS-859.
Merge pull request #21 from avasquez614/master

Fix for CRAFTERCMS-859.