Updated ws_fnc to latest ws_fnc master