minor - fix userdir expansion
merged
minor changes
Merge branch 'master' of github.com:mfiers/Yaco into Yaco2
Merge branch 'Yaco2' of github.com:mfiers/Yaco into Yaco2