Updated few more changes to CORE-433
Merge pull request #83 from saravanab/master

Updated few more changes to CORE-433