Implemented pull request #68