Updated based on changes in master branch.