Fixes to bugs reported by prestashop during first review stage
Merge pull request #3 from PrestaShop/develop

Fixes to bugs reported by prestashop during first review stage