Merge func Server.ListenAndServe with ListenAndServe
Merge pull request #1 from RoelVanNyen/merge_listenandserve

Merge func Server.ListenAndServe with ListenAndServe