fix #7
Merge pull request #16 from minjiyang/iss7

fix #7
fixed #3
Merge pull request #17 from eunmin/iss3

fixed #3