Improved filehandle debug
Solved merge conflict