added card funcs
added card funcs
Merge branch 'waddo-master'
merge fix