minor stuff
fix last chapter
fix cherry-merge
Merge branch 'master' of https://github.com/Fredrik89/mt

* 'master' of https://github.com/Fredrik89/mt:
  Results checked up to test 4