Commit by DInesh

This time please review it & commit.