Fix
FixMerge branch 'master' of github.com:ikishik/parra-shop.com