merge from  zaphoyd / websocketpp