fixed a few bugs found in HW2
another fix
Merge remote-tracking branch 'upstream/master'