API preloading has been refactored
Merge branch 'master' into DecoratorPattern
Some refactoring around the Prometheus class