Merge pull request #40 from aelgru/master

Quickfix for #39
Some changes after running it on 1025 hosts.