Applied @stof comments for the pull request #8