Make IP address configurable
Resolve conflict, merge PR from @yudai