fixes according to instructions in pull request #20