few modification because of compiling issue using c++11 and gcc