New Joker Changes
2 More changes
Merge pull request #327 from buddytex/InDev

In dev