added builder objects.
and some performance tweaks
Merge branch 'builder'

# By robbe anckaert
# Via robbe anckaert
* builder:
  added builder objects. and some performance tweaks