chp5 2th edition
Merge pull request #18 from linsidu/develop

Develop
Merge branch 'gh-pages'