Merge pull request #1 from benjskim/master

First edit