some bug fix
doxygen documentation added