fix bug
merge
Merge branch 'master' of https://github.com/cardteam/card
fix bug