Added dynamic IPs
Merge branch 'feature/DynamicIPs' into develop