更新

fixed #3
fixed #4
Thx ZoeyYoung.