+ static-ip support
Update from code reviews
Implemente changes from code review