Bug fix

debug-print:code-walk did not treat well defun.
Code cleanup
Merge remote-tracking branch 'origin/master'