Issue 16 Fixes
Issue 14 has been fixed and also fixed many other issues. eg Some of the products does not get wrap properly