issue #1 improved magento parser