Fixed #52
Merge branch 'master' of github.com:tlrh314/CARD