Pull request branched into new repo...

Merge from Github written original.