Revert "Merge pull request #11 from KaushikRay/dev_c_2"

This reverts commit e86fbbe837b85f3a1dfc13232acc476a8c66d7d6, reversing
changes made to ef908b5c2f68819158c09a253e34c1cd36639275.