Merge pull request #2 from bredov/pull-request

Fix Expand for path of len <= 1.