Fixes for file
module
#158
+47
−2
Merged
file
module
#158