Bug Fix

Signed-off-by: Pengfei Zhang <pzhang11@stevens.edu>
Merge branch 'master' of https://github.com/andysim3d/CS555.git