Modified cmdparser.hpp and timer.hpp