Finished fix for CRAFTERCMS-764.
Merge pull request #23 from avasquez614/master

Fix for CRAFTERCMS-764.