fixed issue with guessing C instead of C++
fixed struct/class issue