close #97, working #90
merge