REFACTOR
Change Filename into File
Merge pull request #1 from thenanox/master

REFACTOR