No longer returns nulls
Merge branch 'master' of https://github.com/hansdaiyi/comp411