Modified CI-Merchant Library