closed #58 closed #56