Bug fixes.
Merge branch 'master' of https://github.com/mit6172/homework2