Updated FileWriter
Merge origin/master