fixes
closed #31