Fix issue#21

Replace `supplement_class = supplement_class()` to prevent the module
level method call thus no unexpected circular references occur anymore.