commit hiding.c
Merge branch 'local'