Merge

Card adapter added.