Improve code quality and coverage
Merge pull request #2 from psgs/master

Improve code quality and coverage