Filename support

I think it is a very useful feature, and it should be merged into the main repo