BUG 159: fixed bind-address bug
merge