Oxford Institute name change.
Added __cplusplus defines for use with C++