1. define move to general.h
2. modify small bug
Merge remote-tracking branch 'origin/Development' into Development