Cleaned pull request #21