extract method for default builder
Merge branch 'refs/heads/current' into ratjens
Merge pull request #18 from marketboomer/ratjens

extract method for default builder