fixes -ip AND rest :)
Merge remote branch 'origin/master'