Updated for the new EE machine & some fixs
Merge pull request #224 from crafteverywhere/patch-6

Updated for the new EE machine & some fixs