ICMP handling fixed
Merge branch 'master' of https://github.com/martinmarinov/bir
Merge conf.