Merge pull request #3 from jh1979-park/dev