fixed #10
Merge branch 'master' into deploy
built relase 30520