Card() comments
Merge origin/master