fixed #11 as promised
fixed multiple collision in one time step bug