better namespace and added missing const to .h file