Two changes on same code part2
Merge branch 'master' of https://github.com/kashd13/CM1101