Changes for 4.3
Merge pull request #351 from rangadi/changes_for_43

Changes for 4.3