Merge pull request #46 from chamankang/develop

add feature to set gateway_ip to null
setup entities only if setup_entities equals true