render with file things in thread 0
makefile fix
Merge origin/master