Jekwan edit commit
Merge pull request #1 from yasita/master

Jekwan edit commit