changed to use Card's enums
Merge remote-tracking branch 'origin/master'