Fixing issue with filewriter
Merge branch 'develop'