kommentar
Fixed some bugs
Merge remote-tracking branch 'hts-upstream/master'