Dev

Incorporated review comments received for #208