Merge pull request #2 from sobeckley/master

Update