Initial commit
Adding support fot the path expansion