Merged 2 pull requests