Fixed #15
Fixed #17
Merge branch 'fixed' of github.com:Acquisto/acquistoShop into fixed
Fixed #17
Merge pull request #18 from Acquisto/fixed

Fixed