fixed load_card bug
Merge branch 'master' into develop