Merge pull request #15 from marketboomer/richard

Some stuff for executive
Merge pull request #16 from marketboomer/ratjens

Ratjens
extract method for default builder
Merge branch 'refs/heads/current' into ratjens