Addressed review comments.
Merge pull request #234 from tapanagupta/ctdbp_no

Addressed review comments.