Merge pull request #1 from jh1979-park/dev