Update mapping; new key is clientnumber
Added missing struct keyword.
Merge branch 'Curlyfries13-master'