Merged Pull request #302 - Thanks to @kpodemski
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development