Added non-blocking server listener
Fixed a ServerListener bug
Merge remote-tracking branch 'origin/master'