Merging some contributer pull requests