more optimiazation
Merge branch 'master' of https://github.com/ylwu/869-final