Expand should use current filename, not just tail of current filename
Merge pull request #15 from myitcv/fix_expand_bug

Expand should use current filename, not just tail of current filename