Add a little improvements.
Merge branch 'beta'