updated
fixed #71, fixed #74