fixes according to comments in pull request #121