Code review: 181710043: Bug fix for issue 62 and some linter changes.