improve style
limit the length of the number
add comments
Merge branch 'master' into gh-pages