adding timer macro protection
adding dbc check for functions that return error codes
Merge branch 'master' into uniform_probability