Rewrite pull request #100