Changes from original collaborative text
Merge branch 'master' of https://github.com/mik3cap/mik3cap.github.io