fix a lot
Merge pull request #35 from JUHYUNCHOI/master

fix a lot