update
small updates
Merge branch 'master' into beta

Stable version