Fixed some lint warnings
Some fixes
Merge pull request #44 from maxirosson/dev

Fixes