Merge pull request #7 from adityagodbole/ci-491

Ci 491
Merge branch 'master' into ci-491
Used => for do in applyEasyWizard function
Removed _that and used @