changes done by ashok
Merge origin/master