Add builder, fixes Issue #2