Adding ContextBuild
Merge pull request #927 from wwoods/master

Adding ContextBuild