added some doxigen stuff
fixed merge issue
merge