Feature/reset

fixings #2