Version sync update

Syncing local version with github and diff'ing.