Merge pull request #25 from Glloyd/master

Map Fixes and Merges
Card fix
Merge pull request #26 from AnturK/cardfix

Card fix