fixed bug
Merge branch 'master' of https://github.com/CSE512-14W/fp-tianyizh-tqchen-luheng