fixed typo
Merge branch '01-cleanup' into 06-contexts2