Fix PEP8 and Pylint violation.
Merge pull request #1102 from akbargumbira/develop

Fix PEP8 and Pylint violation.