Merge remote-tracking branch 'origin/master'
prevent 'underflow'

I.e. numbers smaller then 1
Merge branch 'master' into gh-pages