mr p duit code added
Merge branch 'master' of https://github.com/rockychat3/4859code