Improve examples. Fixes #5