Getting rid of a few cppcheck warnings.
Merge pull request #44 from dchilot/bugfix/cppcheck_warnings

Getting rid of a few cppcheck warnings.
Solve tiny conflict.