Card handling fixes
Merge pull request #306 from orta/tiles

@ashfurrow => Card handling fixes