Merge pull request #52 from jponge/wip/dynamic-evaluation

Dynamic code evaluation
Merge branch 'master' into wip/templating