Merge pull request #2 from XaeroDegreaz/hotfix/incompatible-type-conversion

Fix issue #1
Merge branch 'hotfix/incompatible-type-conversion'
Merge branch 'master' of https://github.com/djr4488/cards
Merge branch 'master' into develop