Merge pull request #27 from myoung34/dev

Dev