syntax
make path more generic
merge after pull