Merge pull request #14 from myoung34/dev

Dev