latest changes to kurbi
latest changes, now i have all the files
fixed header file conflict