fixed #71
fix #72
Merge pull request #73 from dtynn/fix/71

fixed #71
Merge pull request #74 from dtynn/fix/72

closed #72
update changelog