Commit before pull
Manual merge between local and remote version
Adjusted some variables for setting payload / datagram sizeze. Not finished.