Changes according to informal review chs. autensiering
Merge branch 'master' of https://github.com/ada10lgu/etsn05