Merge commit
Merge branch 'master' of https://github.com/kendetta/HMS-Git.git
Merged Edward Changes