Updated with changes made to pull request.