Magento 1.8

Updated 1.8 module inline with 1.7