Merge pull request #1 from myoungwoon-kim/dev