update

code guard for header file
Merge branch 'mike-Y'