fix Infinity and shift update time to N.9
Merge branch 'master' into gh-pages