Changes for 4.0
Merge pull request #315 from rangadi/changes_for_4_0

Changes for 4.0