fixed the type calc for static value expression
fixed type system
Merge remote-tracking branch 'origin/master'