fixed empty text on start
Merge branch 'master' into black