Merged pull requests from original repo