updated
Merge branch 'master' of https://github.com/wqfish/hw4b