pull request merged. close #7