closed #87 closed #88

and below.

correct auto merge