drobne upravy, bug fixi
Merge remote-tracking branch 'upstream/master'