Merge pull request #280