replaced functools.wraps by safer equivalent
replaced functools.wraps by safer equivalent

claesenm/optunity,MarkAWard/optunity,claesenm/optunity,MarkAWard/optunity,MarkAWard/optunity,chrinide/optunity,chrinide/optunity,claesenm/optunity,MarkAWard/optunity,chrinide/optunity,chrinide/optunity,claesenm/optunity