Add + operator for time_point
Fix implementation to use existing function
Fix rebase error
Fix timer implementation in thread
Fix namespace