Merge branch 'master' into bug-fix
fixed bug
Merge branch 'bug-fix'