Edit chp 1-5 after suggestions by thusoy
Merge pull request #26 from martme/martin

Edit chp 1-5 after suggestions by thusoy