Fix issue #20

The issue is caused by wrong regex.
This PR also includes pylint fixing.