Builder now returns init'ed obj
Merge remote-tracking branch 'origin/master'