Improved C++ call resolving
Added Preprocessor to deal with macro's