Merge develop into master

Features: Object Builders

Fixes: Complete rework of code