Refined set reset
Merge remote-tracking branch 'ej/setRest' into bugfixes
Fixes ip problem. good to go