Fixed issue #8

wqian94
cmobrien
czuo