Merged pull request #124