make client logic consistent
Merge pull request #4 from Kentaxer/master

make client logic consistent