Merge pull request from llicour