Manually merge pull request. #79