Merge pull request #190 from Marcuzz/master

Fixes from b2ae7a2
add cid to map 8 player query
Merge pull request #192 from wriley/mapfixplayer

add cid to map 8 player query