Fix CRAFTERCMS-847
See issue for further instructions
Merge pull request #28 from cortiz/master

Fix CRAFTERCMS-847