0.2.1 version bump
Isolate generic args from the API specific args
Flake8 fixes