Additional linting
Merge pull request #43 from palourde/bugfixes

Additional linting