fix #191, #189
Merge pull request #2 from greenlaw110/master

fix #191, #189