Andrey Ivanov

There was already a PR with generics, but it was pretty old and hadn't been merged, so I decided to add type parameters, constraints, and generic types here.