File Module, 20131203
Merge pull request #27 from ChristianGruen/master

File Module, 20131203