fix issues with targetUser
Merge pull request #927 from MJB47/mafia

fix issues with targetUser
Merge remote-tracking branch 'upstream/master'