Andrew/David - tweaking example to be compatible with 0.7 SNAPSHOT