adds a builder for use in production and tests for the evaluation context
Merge pull request #6 from gregjan/master

adds a builder for use in production and tests for the evaluation context

Relates to: https://www.pivotaltracker.com/story/show/70943414