more clear logic and preparation to variable time step
#12