Fixed: typo
Changed: removed unused variables
Merge branch 'master' into Fix_EZP-19979