Add deck support
Merge pull request #54 from eltados/deck

Add deck support
Merge remote-tracking branch 'origin/master' into db
more db changes