Code Optimizing
Merge branch 'master' of https://github.com/johannawald/ICT207