use macro define-word
Merge branch 'lee'