Some updates to improve the examples
Merge pull request #18 from Omegaice/example_improvement

Some updates to improve the examples. Closes #17