Merged several open pull requests