Merging pull request from ebfe