Fixes from testing and new example file.
Fixes from testing and new example file.

Signed-off-by: Paul Osborne <53d544264adec677b85cc2f4d9f73264543f832b@spectrumdsi.com>

luigiberrettini/Anvil,posborne/Anvil