Merge pull request #1 from nelsoft-easyshop/master

asdasdsadasd
Merge pull request #3 from nelsoft-easyshop/dev

Fixes #2 from nelsoft-easyshop/master