Merge remote-tracking branch 'khizmax/master'