CXX Flags aren't definitions
fixed weather code
Merge remote-tracking branch 'vheuken/master'