update
update
Merge remote-tracking branch 'origin/master' into beta

Test
test
minor updates
minor updates
minor updates
minor updates
Merge branch 'master' into beta

Stable version