fixed #100
(cherry picked from commit 6d2092e)
(cherry picked from commit 2b80f50)
update 1.0.1

fixed #100