Merging commits to my fork

Merging commits made by others to my fork.