Cleanup to get rid of warnings
Fix infinite loop bug
Merge branch 'master' of https://github.com/bonusly/tangocard