Better extra examples. Closes #23