Opravy drobných bugů
Merge remote-tracking branch 'git/master' into master-github