Refined and documented builder

Fixes #5