Merge branch 'saved-cards' Fixes #37