Merge pull request #56 from dhfromkorea/master

fixed typo
merge conflict solved