Modifed file to remove depreciated calls and let the SimpleServer example work.
Merge remote-tracking branch 'kaptk2/master'