Fork refresh

Just syncing over master branch of original...
Let the "Octo" work begin...