improvements close #5