small changes;
Merge pull request #1 from choigoonho/master

Request merge