J.W. added test cases.
Merge branch 'master' of https://github.com/wongwingho/csc324