Rebased with master, changed versioning display.