Merge original master

Merging changes from original repo into my fork.