Fix pull request #13