fixed #68
Resolved #74