closes #157
Merge pull request #158 from magento/vgadiyar-157

closes #157