close #62, working on 112