CRAFTERCMS-588: Implemented feature.
Merge pull request #12 from avasquez614/master

CRAFTERCMS-588: Implemented feature.