added adaptive timestep, so it is a bit more stable
Merge origin/master