Output to log.txt if no tty
Merge branch 'dev'