Changes to various
Merge branch 'master' of github.com:Koxzi95/smt-books