Fixed a bug that led to random crashes on linux machines
Merge branch 'master' of https://github.com/xiecheng59/CS123