Merged changes back into my fork.