Merge pull request #24 from ahwayakchih/master

Improved file serving.