Fixed #33, Fixed #43, Fixed #44
Merge branch 'master' of github.com:tlrh314/CARD