Submitted another pull request #60