Some updates
Merge branch 'master' of https://github.com/DennisdeW/Module5.git