Merge pull request #21 from peterzimon/bookmark-card