fix #333
Fix 328
Merge branch '1.2.0' of github.com:abantecart/abantecart-src into 1.2.0