PERF-8 Backwards compatibility.
Merge pull request #4 from gruenspar/dynamic-blocks

PERF-8 Backwards compatibility.