Review https://github.com/pullfrogai/scratch/pull/17