Conf

Merged dreamer requested to merge conf into master

Merge request reports