refactor part 4
refactor part 5
Merge remote-tracking branch 'origin/master' into gh-pages