Merge aspiers' pull request #21