fixed typo
Merge branch 'refs/heads/stable'
add a few comment
use div instead of p tag
update lib
Merge branch 'refs/heads/master' into stable