fixed #1, #2
Merge pull request #3 from eunmin/master

fixed #1, #2