C preprocessor support added