Adding multiple moving points to catch
Merge branch 'master' into gh-pages