after pull request adjustments, v0.7