Some minor changes
Merge branch 'master' of https://github.com/Chenz91/EDA221---Lab-5