import expand as expand_path
Merge pull request #297 from ndawe/master

Fix #296