fixed the bug
Merge branch 'master' into beta