Committing some modification as per the review comments (08/12/2014)