pull request from repository 0.8.0-a