Added CommandLine, updated Deck
Merge remote-tracking branch 'origin/master'