Added file logging
Merge branch 'master' into production