fixes #8
Merge branch 'chapter11' of https://github.com/avellanas/sample_app into chapter11