Merge pull request #5 from cfwheels/new-master

pull from upstream
expand path only if necessary
Merge pull request #232 from scahyono/bugfix

repair test failed #231