Merge pull request #19 from myoung34/dev

Dev
Merge pull request #23 from myoung34/dev

Dev