Remove warnings: 'not used variable' and 'shadowing outer variable'
Merge pull request #487 from carlosantoniodasilva/remove-warnings

Remove warnings: 'not used variable' and 'shadowing outer variable'