fixes
Merge branch 'hltd-150' of ssh://github.com/smorovic/hltd into hltd-150