Fix apparent bugs
Merge pull request #9 from kjyoun/master

Fix apparent bugs