[ pull request #86 ]