FIX: Backports
STY: Fixes
FIX: Deprecated fun
FIX: Deprecations
STY: Flake8
Merge pull request #36 from Eric89GXL/backport

FIX: Backports