New Joker Changes
Merge pull request #322 from buddytex/Dev

New Joker Changes