CRAFTERCMS-177 and CRAFTERCMS-159. Manage to fix those issues
Merge pull request #19 from alvarog/master

CRAFTERCMS-177 and CRAFTERCMS-159. Manage to fix those issues