Ann sample by godspeed1989

Replacement for #733