Updates

As discussed previously, here is my pull request.