Magento Integration for issue #16