add more cases for the card handler
Merge pull request #75 from orta/beta

@ashfurrow => add more cases for the card handler