Improved HR-326, HR-327 and HR-329
Merge pull request #513 from monishdeb/HR-327

Improved HR-326, HR-327 and HR-329