fixed #35
closed #58