upstream merge

+ merge packethandler branch into master
+ configurable hostname and port for client settings