GH426 - rebase

#426 

use GH426 - rebase branch to make changes.
at the end, register updates for File System & Git