Fork that includes nested-blocks support (#117 in original repo) and other tweaks