better havlak code
Merge pull request #100 from kostya/hvfix

better havlak code