Merge branch 'dev' of https://github.com/edunumsec2/book into dev

Merge branch 'dev' of https://github.com/edunumsec2/book into dev #683