Merge pull request #1 from kellydunn/develop

Update from original