move #Define to cpp
add #define
Merge branch 'master' of fitark.org:uranus/stk