Changes for Issue - 242

Spenser,

Please review the changes and merge this. This is for issue - 242.

Thanks,
 Renu