Added random stopping points
Merging changes from origin