Lint fixes.
Merge pull request #21 from aleph2012/lint-fixes

Lint fixes.