own ip-address can be set in settings-menu
Merge remote-tracking branch 'origin/master'