added ip < 255 check
fixed a git conflict