Added to init
Added preprocessor flags for mac and windows support
fixed class name issue