Have done some small updates.
Made some changes

Merge branch 'master' of https://github.com/lrhgit/tkt4140