closed #58
closed #57