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

Updated for the new EE machine & some fixs