Signed-off-by: yuexin <yuecn41@gmail.com>
Fix #99.
Reverts #141 which @cirosantilli wrongfully merged. Add regression tests that would have prevented that. Correction pointed out by @shanesmith at #147.