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