Added pull request 138