Pull Request from Willis

thanks