Final update: remove warning
Merge branch 'master' of github.com:chianged/assignment05