Update and merge pull request #20