fixes #50
Merge remote-tracking branch 'upstream/pr/58' into test/58
Fix flake8 violations in #58