handle return correctly
Merge branch 'master' of https://github.com/nacuong/cs294-98